Datamapper modified