More changes to store the data