Python adjustments for new model