added support for multiple datastores