Continue working on role mapping.