Add virtual channel support