Updated all examples to new standard