Added a glue layer for using datastore with endpoints.