Added better solution for admin modules