Updated order statuses handling