Change inclusion of omnibus plugin to new format