Enhance the logic of models and admin views for models here