Implemented new role system