Override changes. Added more of the API.