Added user and role classes.