Updated to support hybrid flow