Add more API changes. Experimental, but may be tested.