Extend timestamps switch