new class and pom changes