Updated classes and pom.xml