add support for extra devices