Updated to V2 config