Adding initial data loading