Update to support platform 17