updated reference to ConstantValues