Isa OE 6.0 modules added to 6.0 branch