Refactoring for global usage