WIP: Add CollectionDefinition and TypeDefinition and add handling of Collection and Compound type in create_model