With method fixed

With method on generated records handles optionality properly