Added c support