Added roles class back in