Enhance the admin view and the models here