Class defs to new class style