Refactoring of common modules