Add archive support