Added supervisor as common role
Added supervisor as common role with fix