Modified to new class name