Change pom and optimized imports