Sources support added, improved channel handling