Update with added enum and composite key PK class.