more API changes

10 files changed