Updated loading of data