Added more types and extern.