add the complex cases to use the backwards compatible plan