Add support for timestamps