Refactored controller (admin controller way)