@rich-nguyen, made this an `Option`, easier to pass through. C'est bien?