Added partial support for infdev/indev