Add some new models, preparing for foreign key value resolution code