Redesigned model to use references to common objects rather than duplicating information.