Update it to the new API developed on top of D8
Update it to the new API developed on top of D8