A plan for expanding the Emergency Firefighting Water Supply (EFWS) system to douse an inferno likely to follow a major earthquake is moving forward, with new pipelines proposed in addition to those already funded.