Updated to removal of ValueConst