Updated classes and pom