Added role support