Datamapper updates