Refactored global namespace