Better arrangement for domain classes