Improved data loading + automatic data update