Upgrade to support both Citrus 2.4.x and 3.x