Refactored OrderData layer.