Added timestamps and timestamp filtering