WIP : changed from using None -> _NotGiven for default value