Updated to use the final API