Added experimental datastore retrieval code.