Added user type and notifications