Refactored to use namespace for constants