Added decorator and admin queryset optimization.