Continued conversion to new class usage