Domain entities and DTO beans refactoring