Domainlayer changes