New relationship mapping for actions
Improving how operators are selected