One more refactoring and pom bug fixed