Added auto loading of data