Server refactoring for domain objects.