Updated examples to be compatible with new architecture.