File structure has diverged quite a bit