Start refactoring database channels