Refactored the model schemas