Added Link fields, improved taxonomy.