changed setup datamapper