Modify API support layer(Internal merge).