diff --git a/README.md b/README.md
index fd4b02d8..1201d5f2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-Spring Data Redis
-=======================
+Spring Data GemFire
+===================
 
 The primary goal of the [Spring GemFire](http://www.springsource.org/spring-gemfire) project is to make it easier to build highly scalable Spring-powered applications using 
 [GemFire](http://www.gemstone.com/products/gemfire) as a distributed [data management](http://www.springsource.com/products/data-management) platform.
diff --git a/src/main/java/org/springframework/data/gemfire/config/ParsingUtils.java b/src/main/java/org/springframework/data/gemfire/config/ParsingUtils.java
index dbbc34d8..14def796 100644
--- a/src/main/java/org/springframework/data/gemfire/config/ParsingUtils.java
+++ b/src/main/java/org/springframework/data/gemfire/config/ParsingUtils.java
@@ -256,14 +256,14 @@ abstract class ParsingUtils {
 		if (expirationElement == null)
 			return false;
 
-		int expirationTime = 0;
+		String expirationTime = null;
 		ExpirationAction action = ExpirationAction.INVALIDATE;
 
 
 		// do manual conversion since the enum is not public
 		String attr = expirationElement.getAttribute("timeout");
 		if (StringUtils.hasText(attr)) {
-			expirationTime = Integer.valueOf(attr);
+			expirationTime = attr;
 		}
 
 		attr = expirationElement.getAttribute("action");
@@ -284,7 +284,11 @@ abstract class ParsingUtils {
 				action = ExpirationAction.LOCAL_INVALIDATE;
 			}
 		}
-		attrBuilder.addPropertyValue(propertyName, new ExpirationAttributes(expirationTime, action));
+		BeanDefinitionBuilder expirationAttributes = BeanDefinitionBuilder.genericBeanDefinition(ExpirationAttributes.class);
+		expirationAttributes.addConstructorArgValue(expirationTime);
+		expirationAttributes.addConstructorArgValue(action);
+		attrBuilder.addPropertyValue(propertyName, expirationAttributes.getBeanDefinition());
+
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/src/test/resources/org/springframework/data/gemfire/config/diskstore-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/diskstore-ns.xml
index f89c6124..c0b499c0 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/diskstore-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/diskstore-ns.xml
@@ -4,9 +4,18 @@
 	xmlns:gfe="http://www.springframework.org/schema/gemfire"
 	xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+	 <util:properties id="props">
+       <prop key="ttl">300</prop>
+     </util:properties>
+
+    <context:property-placeholder properties-ref="props"/>
+    
 		
 	<gfe:cache />
 	
@@ -15,7 +24,7 @@
 			<gfe:disk-dir location="./" max-size="1"/>
 		</gfe:disk-store>
 
-		<gfe:region-ttl timeout="300" action="DESTROY"/>
+		<gfe:region-ttl timeout="${ttl}" action="DESTROY"/>
 		<gfe:region-tti timeout="400" action="INVALIDATE"/>
 
 		<gfe:entry-ttl timeout="100" action="DESTROY"/>