Switch to the new API version 2