code cleanup + TODOs on datastore config
added NotImplementedException and logging messages