Add optionality to the consumer