Added string values to replace hard coded strings