Fix for new model schemas