More support for new version.