Updates to support use of both discrete and continuous range values