API inner changes