Tweak interface of datamapper
Further datamanager interface tweaks