Better way of writing the rule additions for #10