Archive Development updates & fixes