Update with fixed cfwrapper.py