refactor/optionalTimestamp