Address refactoring
Shared config with update