Added OE 8.0 modules