Updated archive structure