Update to use API r4 by default