Lot of updates including diagram support.