Updated to use the python helpers