Add APIs in proper order to avoid ambiguous deprecated methods