Added typedef functionality