Use defined constants instead of strings