Modify pom.xml and some classes