Added authorized users handling