Moved prefab out of core package
Corrected a possible pump connection issue