[A] Add archive support