Refactored the namespace