Some rework on the api channel.