Better channel handling