Switched from relying on the python API's as much.