added support for timestamps