Added configurable timestamp