Improved time handling in archive