further changes for datamapper