Making admin only feature more effecient