Update to API 2.1.8