Add "max" support