Hotfix/role separation

Hotfix/role separation