Update for poc6 changes