added support for (optional) timestamps