Updated to latest API update