Add support for changing devices