Refactored OrderBuilder