Changed DtoProperties to be (almost) a Map