Improve @DomainClass