Use constants instead of magic strings