Current store is now handled in core.