Updated to the new API version