WIP: refactored domain object validations.