Add data loading part