Some refactoring in new version 'archiver'