Changes for new pyfish api