Add new class and methods