Overall Code refactoring for new vendor dependencies.