Some changes to data structure