Feature/c extension