Added optional timestamp field