Added support for more device models.