Datamapper support improvements, passing tests