Changes for the new sdk 1.14