Adds support for different devices