Some changes in data structures