Update consumer API, still work in progress.