More preparation for version move