Updated code flow and hybrid clients