Added datamapper keyword