Add min/max as we need