Updates for libraries and pom to be cleaner.