Cross-version support