Refactored namespace