Add API 10 and API 17