Make everything go through the same code path instead of each calling the base API, to make it easier to apply changes in one place