Finish updating models so alerts are a property