added: data store support