Some modifications in data structure