Added role context holder