Added role level and fixed username params