Updated ISR, Construction Class, Control Class