Move old class conversion to loadState