Further modifications to the order object