Add option fields for pre-created emitter and receiver clients