diff --git a/conf/attribute-resolver.xml b/conf/attribute-resolver.xml
index b51cd2f..26cc291 100644
--- a/conf/attribute-resolver.xml
+++ b/conf/attribute-resolver.xml
@@ -63,7 +63,7 @@ list of possible components and their options.
 
     <AttributeDefinition id="eduPersonTargetedID" xsi:type="SAML2NameID"
         nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent">
-        <InputDataConnector ref="storedID" attributeNames="storedID"/>
+        <InputDataConnector ref="sqlite-db" attributeNames="persistentId"/>
 
         <AttributeEncoder xsi:type="SAML2XMLObject"
                 name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="eduPersonTargetedID" />
@@ -83,11 +83,21 @@ list of possible components and their options.
         </Attribute>
     </DataConnector>
 
-    <DataConnector xsi:type="StoredId" id="storedID"
-	    generatedAttributeID="storedID"
+    <DataConnector xsi:type="ComputedId" id="computedID"
+	    generatedAttributeID="persistentId"
 	    salt='04D00D29-5FFF-4732-8645-ED8B7678BE4E'>
         <InputAttributeDefinition ref="uid" />
-        <BeanManagedConnection>sqlite-dataconnector</BeanManagedConnection>
+    </DataConnector>
+
+    <DataConnector id="sqlite-db" xsi:type="RelationalDatabase" noResultIsError="true">
+	    <FailoverDataConnector ref="computedID"/>
+	    <SimpleManagedConnection jdbcDriver="%{datasource.driverClass}" jdbcURL="%{datasource.jdbcUrl}" />
+	    <QueryTemplate>
+		    <![CDATA[
+			    SELECT persistentId FROM shibpid WHERE peerEntity='$resolutionContext.attributeRecipientID' AND principalName='$resolutionContext.principal';
+			    ]]>
+	    </QueryTemplate>
+	    <Column columnName="persistentId" attributeID="persistentId" />
     </DataConnector>
 
 </AttributeResolver>