Updated to API 2.0