updated models and api