Added a lot of work on App domain model.