Add support for d2 devices