models and CRUDs updated