Improved Streamline-based Simulation for CO2 Storage