Added timestamp functionality