#96 added explicit support for non-transactional datastores