Minor changes to schema and model objects