Import Optimization and pom update