Some structural changes, new class