Better handling of amount param