Updated to use released API