Updated to API 3.7