[IMP]improve the code as per new api