updated models and admin