Use User constants instead of hard coding