DataMapper upgrade