Backward-compatible support