Added support for max_value and min_value