Replaced hard-coded strings with constants