switching to schemas instead of models