Move CMB plugin check later