Further changes to model to reflect our new UI direction.