Added roles and role attributes