Added Min and Max support