Updated archiving to work with multiple dimensions
Added unit test