Added support for other devices.