Add missing `with_*` functions