Refactoring API to expose less data.