Modify from hard-code-value to constant-value