Added more code to load data.