Major updates to models and flow