Change approach to maintain fallback to version 1