This resolves #2 - timestamp is now optional