Extend support for other versions