Made model updates more configurable and reliable