Refactoring
General
additional modifications after updating all shared dependency packages to latest versions