Add support for percentage and quantity