Fix demos to support the new class hierarchy