Code splitted to a new class