Simplify domain objects and other minor changes.