Fixing ITD and pom.xml generation issues