Changes from legacy_mode to version 0