First steps towards better archive handling