Change order that fields are updated
Add proxy connection strategy to enable different proxying strategies to be plugged in