Add support for non-operational devices