adding datamapper support