Streamline the Fluid package