added missing datamapper parts