Update for new class structure and simplify examples some.