Added structures for device/infrastructure calls and for interface calls as well (for future use)