Added roles and class based configuration