Updated with more link types.