Added typdefs