Changes to allow integration of pom