Updated to the latest API version