Update header file and deprecate some APIs