Add support for spare devices