Update to use new class