Add missing modules to OA2 Beta4