Add new class and fix utils