Do we need a version check or is this forward-compatible ?