Added more C types