Reduce use of Version
Simplify timestamp comparison