Add additional channel interface.
Various cleanup.