improved models and admin