Refactoring POM + Fixing Bug of Add without company