Correlation support for 2.4 and 2.2