Adding support for archive