Updated flow capable models and affected code