Change of data structure for consistency