Updates to domain model and presentation