Plan unveiled for the next generation of Metro