Add more structures for the C part.