Added constants inplace of strings