Added min, max support