Adding new class and some JavaDoc