Add datamapper and thanks