Added role check