Changes on cli classes, pom.xml and ERD.