Use ApiAdapter method to limit exposure. Add TODO