Added hack to allow overriding Address required_fields