More datamapper changes