Updates to domain classes