Refactoring, Added users groups in admin panel