Added extra fields so that archives are populated properly [Finishes #65...

...441550]