Improved waterfall init/destroy