Added parsing for quantity