updated DataMapper, Domain and Rest Resources