Lots of improvement in model management and  generator