Code changes for typeDataOrder