Added nodes and modified the Device interface