Modified according to new sdk release