Project updated, to support pom.xml building