Added multiplex support