Added typedef for structures