Loading and indexing are now separate steps