Datamapper refactoring.