datastore support added: