[BUG][FIX] ChangeSet class order