Refactored to use constants