Add custom link types
Ignore generated files
Merge