Updated due to recent changes in pom.xml