[#7] - Namespace property refactoring