Updated authorization checks