Updating schema to match domain model diagram