Use constants instead of strings