small fix on generating data => now data structure is ordered by columns field