Add possibility to change the order of data