Moved hard coded strings to constant classes