Replace hardcoded values with their correct definitions