More support for devices