With new class lib