Add support for a few more devices