Several api's are fixed and added.