Added support for unlimited quantity.