Added support for more deivces