Adding support for all v3 apis