Added sdk versions 16 and 17