Add Datamapper support