Begin updating to API 1.8