Add max value support