Improve usage of OrderFactory and methods