Common lib major refactoring