Properly handle timestamps