More work on role mapping.