Add support for more devices