Update database models to use a composite primary key