Update the airflow elements
Rework is close to complete