Is there a reason this needs to be mandatory for all use-cases?