added channel support, moved Collections to root