diff --git a/rest/starbucks/pom.xml b/rest/starbucks/pom.xml
index 0df9cf7c..6b5a06b6 100644
--- a/rest/starbucks/pom.xml
+++ b/rest/starbucks/pom.xml
@@ -12,6 +12,10 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
+	<properties>
+		<spring-hateoas.version>0.17.0.BUILD-SNAPSHOT</spring-hateoas.version>
+	</properties>
+
 	<dependencies>
 
 		<dependency>
diff --git a/rest/starbucks/src/main/java/example/stores/StarbucksClient.java b/rest/starbucks/src/main/java/example/stores/StarbucksClient.java
index e98a6544..cc20c15a 100644
--- a/rest/starbucks/src/main/java/example/stores/StarbucksClient.java
+++ b/rest/starbucks/src/main/java/example/stores/StarbucksClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,21 +18,20 @@ package example.stores;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.StreamSupport;
 
-import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.hateoas.PagedResources;
 import org.springframework.hateoas.PagedResources.PageMetadata;
 import org.springframework.hateoas.Resource;
 import org.springframework.hateoas.client.Traverson;
+import org.springframework.hateoas.mvc.TypeReferences.PagedResourcesType;
 
 /**
  * @author Oliver Gierke
  */
 public class StarbucksClient {
 
-	private static final ParameterizedTypeReference<PagedResources<Resource<Store>>> TYPE_REFERENCE = new ParameterizedTypeReference<PagedResources<Resource<Store>>>() {};
-
 	public static void main(String[] args) {
 
 		Traverson traverson = new Traverson(URI.create("http://localhost:8080"), MediaTypes.HAL_JSON);
@@ -44,19 +43,16 @@ public class StarbucksClient {
 		PagedResources<Resource<Store>> resources = traverson. //
 				follow("stores", "search", "by-location").//
 				withTemplateParameters(parameters).//
-				toObject(TYPE_REFERENCE);
+				toObject(new PagedResourcesType<Resource<Store>>() {});
 
 		PageMetadata metadata = resources.getMetadata();
 
 		System.out.println(String.format("Got %s of %s stores: ", resources.getContent().size(),
 				metadata.getTotalElements()));
 
-		for (Resource<Store> resource : resources) {
-
-			Store store = resource.getContent();
-
-			System.out.println(String.format("- %s - %s", store.name, store.address));
-		}
+		StreamSupport.stream(resources.spliterator(), false).//
+				map(Resource::getContent).//
+				forEach(store -> String.format("- %s - %s", store.name, store.address));
 	}
 
 	static class Store {