Improved config handling in sawa connector