Updated to make use of the newly released API