Refactored shared constants