Improve support for multiple devices