Add definitions of composite types