Datamapper solved