Added roles handler