EntityFetcher renamed EntityStore
Forms back in (not tested)