Updated models and crud for revised schema