Fix interface (missing structs)