Include all address fields, other config