Update for some new functions definition