Add support for datastore safedirs