Update for datarepository so that data is only loaded from disk once unless something has changed