Added draft 'selector for role' functionality.