Continue upgrate to version 6 of all examples