Updated to latest API version