Fixed pom issues and import issues