Archive support + container dev chgs