Add: new class for logic