Added tracking of quantities + min max values