Make Orika more flexible.