Code clean
Backwards compatibility with previous version backup format