Added domain model and user interface