Refactored to use namespace.