Updated models and admin view