Changed to use new class