JBIDE-18541: Add alternative strategy to composite references