Making payment option info optional (#7, #8)