Multiple devices now supported