Updated datamapper setup