Main class addition