[IMP] Add quantity control