Update API and pother chachanghanges