Add support for time stamps