Completed model definitions for main data structures