diff --git a/facts/2.5/solaris-10-i86pc.facts b/facts/2.5/solaris-10-i86pc.facts
new file mode 100644
index 00000000..6c45a967
--- /dev/null
+++ b/facts/2.5/solaris-10-i86pc.facts
@@ -0,0 +1,201 @@
+{
+  "kernelmajversion": "Generic_142901-14",
+  "uptime_hours": 188,
+  "kernel": "SunOS",
+  "hardwareisa": "i386",
+  "augeasversion": "1.3.0",
+  "bios_vendor": "Phoenix Technologies LTD",
+  "bios_version": "None",
+  "bios_release_date": "07/03/2018",
+  "manufacturer": "VMware, Inc.",
+  "productname": "VMware Virtual Platform",
+  "serialnumber": "VMware-42 13 12 4d 2d ba 38 a4-36 3a 9e dc 6c c8 31 cb",
+  "uuid": "4213124d-2dba-38a4-363a-9edc6cc831cb",
+  "type": "0x1 (other)",
+  "processors": {
+    "models": [
+      "Intel(r) Xeon(r) Gold 6154 CPU @ 3.00GHz"
+    ],
+    "count": 1,
+    "physicalcount": 1
+  },
+  "kernelrelease": "5.10",
+  "processor0": "Intel(r) Xeon(r) Gold 6154 CPU @ 3.00GHz",
+  "processorcount": 1,
+  "virtual": "vmware",
+  "is_virtual": true,
+  "operatingsystemmajrelease": "10",
+  "system_uptime": {
+    "seconds": 678240,
+    "hours": 188,
+    "days": 7,
+    "uptime": "7 days"
+  },
+  "zfs_version": "4",
+  "architecture": "i86pc",
+  "hardwaremodel": "i86pc",
+  "operatingsystem": "Solaris",
+  "os": {
+    "name": "Solaris",
+    "family": "Solaris",
+    "release": {
+      "major": "10",
+      "full": "10_u8"
+    }
+  },
+  "netmask": "255.255.255.0",
+  "ipaddress": "10.129.81.88",
+  "sshdsakey": "AAAAB3NzaC1kc3MAAACBAKCAHHQGdXYScLT/w1VNMNhT5+kg+e8FldPaQJzGEmKH68F/a9P6mjJIbRZeh+vXt0X0XYJgyBpOaOITq74z7g+1zOwfqJuSz0BuAV7BVWiv37VzOzgyu49IvmwqSAq0lJ4lE4D7bP4zxCMX35hiiUUTNHieyyzX+TlcrqG0TyQDAAAAFQClK62zeX5Tu0aqc1xGkYoxc9BtuQAAAIBowjm+eUOtLBNlPzF1KsWsiQo3TvrmIgT6izyvxEdE08eEyCCrNUEQBRwMIlB6SYlNOnFBrCx1zrtQYInU7VMbgoIX2QU4Fa8BbmVekAMjcPfvlJ44R3xXmciIJK8wwxc32YZhWBgY64iVTi/Bujt4tSAAHxpAkJb7Ap0jvF9YuAAAAIEAn8wjBqx8Y+ZsVcXOn4Algx3GNNUlxyOAiWrU5usSe2hras/hd9Fqd4Hcl+/FiUZweDqsReFSeozktrL0i2f24C24vHAoC0p76Q62CBNWHOBYBwGGXLDnFLTWk0S/gjAhMeZ+Rwj/JMoF6Vo1VXVm7wTcUbQz1YXfojfAcWiN/IM=",
+  "sshfp_dsa": "SSHFP 2 1 977aec3f6fcf877a5690dd5398f91ed41bda6f98\nSSHFP 2 2 472b178d989a6977f9a89ec0f04450781f69615605819b300248267499bb2f4f",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAABIwAAAIEArh7SiGnBU80dKkLWk4cUwbW2T/syHjtHgJq025UE1VY/vjJUNxLB+/ZbO6r4T/nX5tcMjGvNfjuk+mKrqUjr7aGJX2bPjVnwdsU+eWk6FxjWGp6Twt0ruj1Cb9CEDmwlmfIdgUJdRWJVSVshgrtmgiIhEuCduSepWB0NGgmM1P8=",
+  "sshfp_rsa": "SSHFP 1 1 9443a15c80047d07ac30c6d5244118308c616a8f\nSSHFP 1 2 c4ddf1c874edfeea4fcd90609302cd67ef16193b4aab74906f857a44dc190ddd",
+  "domain": "example.com",
+  "uptime_seconds": 678240,
+  "memorysize": "4.00 GB",
+  "memoryfree": "2.51 GB",
+  "swapsize": "4.00 GB",
+  "swapfree": "4.00 GB",
+  "swapsize_mb": "4096.00",
+  "swapfree_mb": "4096.00",
+  "memorysize_mb": "4096.00",
+  "memoryfree_mb": "2565.74",
+  "zone_global_id": "0",
+  "zone_global_name": "global",
+  "zone_global_status": "running",
+  "zone_global_path": "/",
+  "zone_global_uuid": "",
+  "zone_global_brand": "native",
+  "zone_global_iptype": "shared",
+  "zones": 1,
+  "zonename": "global",
+  "id": "root",
+  "fqdn": "myhostname.example.com",
+  "interfaces": "lo0,vmxnet3s0",
+  "ipaddress_lo0": "127.0.0.1",
+  "netmask_lo0": "255.0.0.0",
+  "mtu_lo0": 8232,
+  "ipaddress_vmxnet3s0": "10.129.81.88",
+  "macaddress_vmxnet3s0": "00:50:56:94:a0:b3",
+  "netmask_vmxnet3s0": "255.255.255.0",
+  "mtu_vmxnet3s0": 1500,
+  "uniqueid": "173777bd",
+  "path": "/usr/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/sfw/bin:/usr/local/sbin:/opt/puppet/bin:/sbin",
+  "rubysitedir": "/opt/puppet/lib/ruby/site_ruby/1.9.1",
+  "operatingsystemrelease": "10_u8",
+  "uptime": "7 days",
+  "gid": "root",
+  "zpool_version": "15",
+  "rubyplatform": "i386-solaris2.10",
+  "ps": "ps -ef",
+  "network_lo0": "127.0.0.0",
+  "network_vmxnet3s0": "10.129.81.0",
+  "puppetversion": "3.8.7 (Puppet Enterprise 3.8.5)",
+  "uptime_days": 7,
+  "timezone": "EDT",
+  "physicalprocessorcount": 1,
+  "hostname": "myhostname",
+  "macaddress": "00:50:56:94:a0:b3",
+  "kernelversion": "Generic_142901-14",
+  "osfamily": "Solaris",
+  "rubyversion": "1.9.3",
+  "facterversion": "2.5.1",
+  "pe_version": "3.8.5",
+  "is_pe": true,
+  "pe_major_version": "3",
+  "pe_minor_version": "8",
+  "pe_patch_version": "5",
+  "serial_port_ttya": "disabled",
+  "serial_port_ttyb": "disabled",
+  "puppet_agent_pid": 298,
+  "env_temp_variable": "/tmp",
+  "platform_symlink_writable": true,
+  "mco_server_config": "/etc/puppetlabs/mcollective/server.cfg",
+  "mco_server_settings": {
+    "plugin.yaml": "/etc/puppetlabs/mcollective/facts.yaml",
+    "libdir": "/opt/puppet/libexec/mcollective/"
+  },
+  "gemhome": "/opt/puppet/lib/ruby/gems/1.9.1",
+  "puppet_inventory_metadata": {
+    "packages": {
+      "collection_enabled": false,
+      "last_collection_time": "0.0s"
+    }
+  },
+  "java_major_version": "5",
+  "puppet_files_dir_present": false,
+  "java_version": "1.5.0_24",
+  "puppet_vardir": "/var/opt/lib/pe-puppet",
+  "puppet_environmentpath": "",
+  "puppet_server": "puppet",
+  "platform_tag": "solaris-10-i386",
+  "supports_latest_puppet": false,
+  "samba_file_present": true,
+  "pe_concat_basedir": "/var/opt/lib/pe-puppet/pe_concat",
+  "vmware_tools": {
+    "version": "9.4.10.37835",
+    "build": "2068191"
+  },
+  "dcos_installed": false,
+  "vcsrepo_svn_ver": "",
+  "java_patch_level": "24",
+  "puppet_ssldir": "/etc/puppetlabs/puppet/ssl",
+  "puppet_config": "/etc/puppetlabs/puppet/puppet.conf",
+  "puppet_stringify_facts": false,
+  "puppet_sslpaths": {
+    "privatedir": {
+      "path": "/etc/puppetlabs/puppet/ssl/private",
+      "path_exists": true
+    },
+    "privatekeydir": {
+      "path": "/etc/puppetlabs/puppet/ssl/private_keys",
+      "path_exists": true
+    },
+    "publickeydir": {
+      "path": "/etc/puppetlabs/puppet/ssl/public_keys",
+      "path_exists": true
+    },
+    "certdir": {
+      "path": "/etc/puppetlabs/puppet/ssl/certs",
+      "path_exists": true
+    },
+    "requestdir": {
+      "path": "/etc/puppetlabs/puppet/ssl/certificate_requests",
+      "path_exists": true
+    },
+    "hostcrl": {
+      "path": "/etc/puppetlabs/puppet/ssl/crl.pem",
+      "path_exists": true
+    }
+  },
+  "puppet_master_server": "puppet",
+  "puppet_confdir": "/etc/puppetlabs/puppet",
+  "puppet_client_datadir": "/var/opt/lib/pe-puppet/client_data",
+  "mco_confdir": "/etc/mcollective/etc",
+  "augeasprovider_grub_version": 1,
+  "package_provider": "sun",
+  "staging_http_get": "curl",
+  "service_provider": "smf",
+  "memorysizeinbytes": 4294967296,
+  "root_home": "/root",
+  "networking": {
+    "domain": "example.com",
+    "fqdn": "myhostname.example.com",
+    "hostname": "myhostname",
+    "netmask": "255.255.255.0",
+    "interfaces": {
+      "lo0": {
+        "ip": "127.0.0.1",
+        "netmask": "255.0.0.0",
+        "network": "127.0.0.0",
+        "mtu": 8232
+      },
+      "vmxnet3s0": {
+        "ip": "10.129.81.88",
+        "mac": "00:50:56:94:a0:b3",
+        "netmask": "255.255.255.0",
+        "network": "10.129.81.0",
+        "mtu": 1500
+      }
+    }
+  }
+}
diff --git a/facts/3.11/solaris-10-i86pc.facts b/facts/3.11/solaris-10-i86pc.facts
new file mode 100644
index 00000000..2d18e9e2
--- /dev/null
+++ b/facts/3.11/solaris-10-i86pc.facts
@@ -0,0 +1,603 @@
+{
+  "aio_agent_build": "5.5.14",
+  "aio_agent_version": "5.5.14",
+  "architecture": "i86pc",
+  "augeas": {
+    "version": "1.11.0"
+  },
+  "augeasprovider_grub_version": 1,
+  "augeasversion": "1.11.0",
+  "bios_release_date": "04/14/2014",
+  "bios_vendor": "Phoenix Technologies LTD",
+  "bios_version": "6.00",
+  "blockdevice_sd0_size": 42949672448,
+  "blockdevice_sd0_vendor": "VMware",
+  "blockdevices": "sd0",
+  "chassisassettag": "No Asset Tag",
+  "chassistype": "0x1 (other)",
+  "dcos_installed": false,
+  "disks": {
+    "sd0": {
+      "product": "Virtual disk    Revision",
+      "size": "40.00 GiB",
+      "size_bytes": 42949672448,
+      "vendor": "VMware"
+    }
+  },
+  "dmi": {
+    "bios": {
+      "release_date": "04/14/2014",
+      "vendor": "Phoenix Technologies LTD",
+      "version": "6.00"
+    },
+    "chassis": {
+      "asset_tag": "No Asset Tag",
+      "type": "0x1 (other)"
+    },
+    "manufacturer": "VMware, Inc.",
+    "product": {
+      "name": "VMware Virtual Platform",
+      "serial_number": "VMware-42 13 b6 ea e1 0f 69 33-02 a3 ac 33 90 f7 3d e7",
+      "uuid": "4213b6ea-e10f-6933-02a3-ac3390f73de7"
+    }
+  },
+  "domain": "example.com",
+  "env_temp_variable": "/tmp",
+  "facterversion": "3.11.8",
+  "filesystems": "autofs,cachefs,ctfs,dcfs,devfs,fdfs,fifofs,hsfs,lofs,mntfs,namefs,nfs,objfs,pcfs,procfs,sharefs,sockfs,specfs,tmpfs,udfs,ufs,xmemfs",
+  "fqdn": "myhostname.example.com",
+  "gemhome": "/opt/puppetlabs/puppet/lib/ruby/gems/2.4.0",
+  "gid": "root",
+  "hardwareisa": "i386",
+  "hardwaremodel": "i86pc",
+  "hostname": "myhostname",
+  "hypervisors": {
+    "vmware": {
+    },
+    "zone": {
+      "brand": "native",
+      "id": 0,
+      "ip_type": "shared",
+      "name": "global",
+      "uuid": ""
+    }
+  },
+  "id": "root",
+  "identity": {
+    "gid": 0,
+    "group": "root",
+    "privileged": true,
+    "uid": 0,
+    "user": "root"
+  },
+  "interfaces": "lo0,vmxnet3s0",
+  "ipaddress": "10.129.81.236",
+  "ipaddress_lo0": "127.0.0.1",
+  "ipaddress_vmxnet3s0": "10.129.81.236",
+  "is_pe": false,
+  "is_virtual": true,
+  "java_major_version": "6",
+  "java_patch_level": "45",
+  "java_version": "1.6.0_45",
+  "kernel": "SunOS",
+  "kernelmajversion": "Generic_151202-03",
+  "kernelrelease": "5.10",
+  "kernelversion": "Generic_151202-03",
+  "load_averages": {
+    "15m": 0.03125,
+    "1m": 0.0859375,
+    "5m": 0.0390625
+  },
+  "macaddress": "00:50:56:17:64:b0",
+  "macaddress_vmxnet3s0": "00:50:56:17:64:b0",
+  "manufacturer": "VMware, Inc.",
+  "mco_client_config": "/etc/puppetlabs/mcollective/client.cfg",
+  "mco_client_settings": {
+    "libdir": "/opt/puppetlabs/mcollective/plugins:/usr/share/mcollective/plugins:/usr/libexec/mcollective"
+  },
+  "mco_confdir": "/etc/mcollective/etc",
+  "mco_server_config": "/etc/puppetlabs/mcollective/server.cfg",
+  "mco_server_settings": {
+    "libdir": "/opt/puppetlabs/mcollective/plugins:/usr/share/mcollective/plugins:/usr/libexec/mcollective",
+    "plugin.yaml": "/etc/puppetlabs/mcollective/facts.yaml"
+  },
+  "memory": {
+    "swap": {
+      "available": "4.00 GiB",
+      "available_bytes": 4294963200,
+      "capacity": "0%",
+      "total": "4.00 GiB",
+      "total_bytes": 4294963200,
+      "used": "0 bytes",
+      "used_bytes": 0
+    },
+    "system": {
+      "available": "2.76 GiB",
+      "available_bytes": 2960699392,
+      "capacity": "53.98%",
+      "total": "5.99 GiB",
+      "total_bytes": 6433595392,
+      "used": "3.23 GiB",
+      "used_bytes": 3472896000
+    }
+  },
+  "memoryfree": "2.76 GiB",
+  "memoryfree_mb": 2823.54296875,
+  "memorysize": "5.99 GiB",
+  "memorysize_mb": 6135.5546875,
+  "memorysizeinbytes": 6442450944,
+  "mountpoints": {
+    "/": {
+      "available": "3.45 GiB",
+      "available_bytes": 3708584448,
+      "capacity": "61.21%",
+      "device": "rpool/ROOT/u11",
+      "filesystem": "zfs",
+      "options": [
+        "dev=2d50002"
+      ],
+      "size": "8.90 GiB",
+      "size_bytes": 9559531008,
+      "used": "5.45 GiB",
+      "used_bytes": 5850946560
+    },
+    "/dev/fd": {
+      "available": "0 bytes",
+      "available_bytes": 0,
+      "capacity": "100%",
+      "device": "fd",
+      "filesystem": "fd",
+      "options": [
+        "rw",
+        "dev=4880001"
+      ],
+      "size": "0 bytes",
+      "size_bytes": 0,
+      "used": "0 bytes",
+      "used_bytes": 0
+    },
+    "/devices": {
+      "available": "0 bytes",
+      "available_bytes": 0,
+      "capacity": "100%",
+      "device": "/devices",
+      "filesystem": "devfs",
+      "options": [
+        "dev=4580000"
+      ],
+      "size": "0 bytes",
+      "size_bytes": 0,
+      "used": "0 bytes",
+      "used_bytes": 0
+    },
+    "/etc/dfs/sharetab": {
+      "available": "0 bytes",
+      "available_bytes": 0,
+      "capacity": "100%",
+      "device": "sharefs",
+      "filesystem": "sharefs",
+      "options": [
+        "dev=4700001"
+      ],
+      "size": "0 bytes",
+      "size_bytes": 0,
+      "used": "0 bytes",
+      "used_bytes": 0
+    },
+    "/etc/mnttab": {
+      "available": "0 bytes",
+      "available_bytes": 0,
+      "capacity": "100%",
+      "device": "mnttab",
+      "filesystem": "mntfs",
+      "options": [
+        "dev=4640001"
+      ],
+      "size": "0 bytes",
+      "size_bytes": 0,
+      "used": "0 bytes",
+      "used_bytes": 0
+    },
+    "/etc/svc/volatile": {
+      "available": "6.03 GiB",
+      "available_bytes": 6475173888,
+      "capacity": "0.01%",
+      "device": "swap",
+      "filesystem": "tmpfs",
+      "options": [
+        "xattr",
+        "dev=4680001"
+      ],
+      "size": "6.03 GiB",
+      "size_bytes": 6475513856,
+      "used": "332.00 KiB",
+      "used_bytes": 339968
+    },
+    "/home": {
+      "available": "9.97 GiB",
+      "available_bytes": 10707177984,
+      "capacity": "0.28%",
+      "device": "tanker/home",
+      "filesystem": "zfs",
+      "options": [
+        "rw",
+        "devices",
+        "setuid",
+        "nonbmand",
+        "exec",
+        "rstchown",
+        "xattr",
+        "atime",
+        "dev=2d50003"
+      ],
+      "size": "10.00 GiB",
+      "size_bytes": 10737418240,
+      "used": "28.84 MiB",
+      "used_bytes": 30240256
+    },
+    "/lib/libc.so.1": {
+      "available": "3.45 GiB",
+      "available_bytes": 3708584448,
+      "capacity": "61.21%",
+      "device": "/usr/lib/libc/libc_hwcap1.so.1",
+      "filesystem": "lofs",
+      "options": [
+        "dev=2d50002"
+      ],
+      "size": "8.90 GiB",
+      "size_bytes": 9559531008,
+      "used": "5.45 GiB",
+      "used_bytes": 5850946560
+    },
+    "/proc": {
+      "available": "0 bytes",
+      "available_bytes": 0,
+      "capacity": "100%",
+      "device": "proc",
+      "filesystem": "proc",
+      "options": [
+        "dev=45c0000"
+      ],
+      "size": "0 bytes",
+      "size_bytes": 0,
+      "used": "0 bytes",
+      "used_bytes": 0
+    },
+    "/rpool": {
+      "available": "3.45 GiB",
+      "available_bytes": 3708584448,
+      "capacity": "0.00%",
+      "device": "rpool",
+      "filesystem": "zfs",
+      "options": [
+        "rw",
+        "devices",
+        "setuid",
+        "nonbmand",
+        "exec",
+        "rstchown",
+        "xattr",
+        "atime",
+        "dev=2d50004"
+      ],
+      "size": "3.45 GiB",
+      "size_bytes": 3708634112,
+      "used": "48.50 KiB",
+      "used_bytes": 49664
+    },
+    "/system/contract": {
+      "available": "0 bytes",
+      "available_bytes": 0,
+      "capacity": "100%",
+      "device": "ctfs",
+      "filesystem": "ctfs",
+      "options": [
+        "dev=4600001"
+      ],
+      "size": "0 bytes",
+      "size_bytes": 0,
+      "used": "0 bytes",
+      "used_bytes": 0
+    },
+    "/system/object": {
+      "available": "0 bytes",
+      "available_bytes": 0,
+      "capacity": "100%",
+      "device": "objfs",
+      "filesystem": "objfs",
+      "options": [
+        "dev=46c0001"
+      ],
+      "size": "0 bytes",
+      "size_bytes": 0,
+      "used": "0 bytes",
+      "used_bytes": 0
+    },
+    "/tanker": {
+      "available": "24.58 GiB",
+      "available_bytes": 26390925312,
+      "capacity": "0.00%",
+      "device": "tanker",
+      "filesystem": "zfs",
+      "options": [
+        "rw",
+        "devices",
+        "setuid",
+        "nonbmand",
+        "exec",
+        "rstchown",
+        "xattr",
+        "atime",
+        "dev=2d50005"
+      ],
+      "size": "24.58 GiB",
+      "size_bytes": 26390957056,
+      "used": "31.00 KiB",
+      "used_bytes": 31744
+    },
+    "/tmp": {
+      "available": "6.03 GiB",
+      "available_bytes": 6475173888,
+      "capacity": "1.80%",
+      "device": "swap",
+      "filesystem": "tmpfs",
+      "options": [
+        "xattr",
+        "dev=4680002"
+      ],
+      "size": "6.14 GiB",
+      "size_bytes": 6594183168,
+      "used": "113.50 MiB",
+      "used_bytes": 119009280
+    },
+    "/var/opt": {
+      "available": "24.58 GiB",
+      "available_bytes": 26390925312,
+      "capacity": "2.92%",
+      "device": "tanker/var_opt",
+      "filesystem": "zfs",
+      "options": [
+        "rw",
+        "devices",
+        "setuid",
+        "nonbmand",
+        "exec",
+        "rstchown",
+        "xattr",
+        "atime",
+        "dev=2d50006"
+      ],
+      "size": "25.32 GiB",
+      "size_bytes": 27185841664,
+      "used": "758.09 MiB",
+      "used_bytes": 794916352
+    },
+    "/var/run": {
+      "available": "6.03 GiB",
+      "available_bytes": 6475173888,
+      "capacity": "0.00%",
+      "device": "swap",
+      "filesystem": "tmpfs",
+      "options": [
+        "xattr",
+        "dev=4680003"
+      ],
+      "size": "6.03 GiB",
+      "size_bytes": 6475218944,
+      "used": "44.00 KiB",
+      "used_bytes": 45056
+    }
+  },
+  "mtu_lo0": 8232,
+  "mtu_vmxnet3s0": 1500,
+  "netmask": "255.255.255.0",
+  "netmask_lo0": "255.0.0.0",
+  "netmask_vmxnet3s0": "255.255.255.0",
+  "network": "10.129.81.0",
+  "network_lo0": "127.0.0.0",
+  "network_vmxnet3s0": "10.129.81.0",
+  "networking": {
+    "domain": "example.com",
+    "fqdn": "myhostname.example.com",
+    "hostname": "myhostname",
+    "interfaces": {
+      "lo0": {
+        "bindings": [
+          {
+            "address": "127.0.0.1",
+            "netmask": "255.0.0.0",
+            "network": "127.0.0.0"
+          }
+        ],
+        "ip": "127.0.0.1",
+        "mtu": 8232,
+        "netmask": "255.0.0.0",
+        "network": "127.0.0.0"
+      },
+      "vmxnet3s0": {
+        "bindings": [
+          {
+            "address": "10.129.81.236",
+            "netmask": "255.255.255.0",
+            "network": "10.129.81.0"
+          }
+        ],
+        "ip": "10.129.81.236",
+        "mac": "00:50:56:17:64:b0",
+        "mtu": 1500,
+        "netmask": "255.255.255.0",
+        "network": "10.129.81.0"
+      }
+    },
+    "ip": "10.129.81.236",
+    "mac": "00:50:56:17:64:b0",
+    "mtu": 1500,
+    "netmask": "255.255.255.0",
+    "network": "10.129.81.0",
+    "primary": "vmxnet3s0"
+  },
+  "operatingsystem": "Solaris",
+  "operatingsystemmajrelease": "10",
+  "operatingsystemrelease": "10_u8",
+  "os": {
+    "architecture": "i86pc",
+    "family": "Solaris",
+    "hardware": "i86pc",
+    "name": "Solaris",
+    "release": {
+      "full": "10_u8",
+      "major": "10",
+      "minor": "8"
+    }
+  },
+  "osfamily": "Solaris",
+  "package_provider": "sun",
+  "path": "/usr/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/sfw/bin:/usr/local/sbin:/opt/puppet/bin:/sbin",
+  "pe_concat_basedir": "/opt/puppetlabs/puppet/cache/pe_concat",
+  "physicalprocessorcount": 1,
+  "platform_symlink_writable": true,
+  "platform_tag": "solaris-10-i386",
+  "processor0": "Intel(r) Xeon(r) CPU E7- 8837  @ 2.67GHz",
+  "processorcount": 1,
+  "processors": {
+    "count": 1,
+    "isa": "i386",
+    "models": [
+      "Intel(r) Xeon(r) CPU E7- 8837  @ 2.67GHz"
+    ],
+    "physicalcount": 1,
+    "speed": "2.66 GHz"
+  },
+  "productname": "VMware Virtual Platform",
+  "puppet_agent_pid": 15662,
+  "puppet_client_datadir": "/opt/puppetlabs/puppet/cache/client_data",
+  "puppet_confdir": "/etc/puppetlabs/puppet",
+  "puppet_config": "/etc/puppetlabs/puppet/puppet.conf",
+  "puppet_environmentpath": "/etc/puppetlabs/code/environments",
+  "puppet_files_dir_present": false,
+  "puppet_inventory_metadata": {
+    "packages": {
+      "collection_enabled": false,
+      "last_collection_time": "0.0s"
+    }
+  },
+  "puppet_master_server": "puppet",
+  "puppet_server": "puppet",
+  "puppet_ssldir": "/etc/puppetlabs/puppet/ssl",
+  "puppet_sslpaths": {
+    "privatedir": {
+      "path": "/etc/puppetlabs/puppet/ssl/private",
+      "path_exists": true
+    },
+    "privatekeydir": {
+      "path": "/etc/puppetlabs/puppet/ssl/private_keys",
+      "path_exists": true
+    },
+    "publickeydir": {
+      "path": "/etc/puppetlabs/puppet/ssl/public_keys",
+      "path_exists": true
+    },
+    "certdir": {
+      "path": "/etc/puppetlabs/puppet/ssl/certs",
+      "path_exists": true
+    },
+    "requestdir": {
+      "path": "/etc/puppetlabs/puppet/ssl/certificate_requests",
+      "path_exists": true
+    },
+    "hostcrl": {
+      "path": "/etc/puppetlabs/puppet/ssl/crl.pem",
+      "path_exists": true
+    }
+  },
+  "puppet_stringify_facts": false,
+  "puppet_vardir": "/opt/puppetlabs/puppet/cache",
+  "puppetversion": "5.5.14",
+  "root_home": "/root",
+  "ruby": {
+    "platform": "i386-solaris2.10",
+    "sitedir": "/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.4.0",
+    "version": "2.4.5"
+  },
+  "rubyplatform": "i386-solaris2.10",
+  "rubysitedir": "/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.4.0",
+  "rubyversion": "2.4.5",
+  "samba_file_present": true,
+  "serial_port_ttya": "disabled",
+  "serial_port_ttyb": "disabled",
+  "serialnumber": "VMware-42 13 b6 ea e1 0f 69 33-02 a3 ac 33 90 f7 3d e7",
+  "service_provider": "smf",
+  "setools_version": "2.3.16",
+  "solaris_zones": {
+    "current": "global",
+    "zones": {
+      "global": {
+        "brand": "native",
+        "id": "0",
+        "ip_type": "shared",
+        "path": "/",
+        "status": "running"
+      }
+    }
+  },
+  "ssh": {
+    "dsa": {
+      "fingerprints": {
+        "sha1": "SSHFP 2 1 672cd5d5f684b1aa7f2eb9cbf1499a74f9160893",
+        "sha256": "SSHFP 2 2 0943fb7f09e258ee372f0427be6f983810e87360de71c2784f32aa6b73575c00"
+      },
+      "key": "AAAAB3NzaC1kc3MAAACBAMlNva2+AitS3fWhgAQ7nHta3N5rSphFJyN++bdzF31Z7k+D6H3xqvmqK97Gj6c2hcyB6sEH9v0NgO0xcP/DAcO9C15GbmV6ZmITnTqIKDsFdR8uBwy6BahylymsVXEYuRMDPIyK4PssNR2GFrxhKHegKQ49NKlddRWeVacf6bzXAAAAFQDlyxxBfb2qpoLd5o6KlDxbJ9bH5QAAAIEApJMhMrB+dBMtP/cOYZ+90epzYXtF3lebVdCVopbZJcIwJHhLuKtrCZhOejIXneEMTWj2EnhcawyJgonFQnTv/wqynPAmeTORp/rfkfUkbHf9y/ZQnjbL1faalUZ9Ykq0sen38PcKdW3FQfAYhRwlqJpYJ+hbRELqQN9af8xgUrQAAACAc9lTB/CMxTmQxFp3hLuzS5eciYVFH9cZHhG/eE6fDXJ2rnz9H0Ltts3eufXMY/bQXWtu0z4SR+ISQbyY9lw+WRB8bwFOLI9yvFU9/WZxefadayo5JeBd1AlE/CYjK+iF6dwbNSuOKM0XInzUvyBFk1OKBjbnGfXCb4xp8rUsNfo=",
+      "type": "ssh-dss"
+    },
+    "rsa": {
+      "fingerprints": {
+        "sha1": "SSHFP 1 1 27357c8daaab49b818dcdc74cc57b1633c187f87",
+        "sha256": "SSHFP 1 2 6445652854135c05e407153fac7d24448f9b2bb1564ca1ecc3f170c19662ef47"
+      },
+      "key": "AAAAB3NzaC1yc2EAAAADAQABAAABAQCyB4qnArG2r5i2nIwFeFXrz9nl9D01qsL+uHdpr8XtgGckZ5mPHlfDmc9l5CYdbwFzCW4fp5r7a003mMFFYf8FYSZ7fpF30I3I84D2YKMdPj3uBJpAPhyaDOh7fzZHCbKcoFFROADwFSGoWuTzOuS4Nf2KpHD0UDQRreN2OSR9040OT7wntPWnXpBS8ImAZdTcsJK0gjaq4EUTqvH3El8tdR+xiUiOHzMgrTVS4zPf5TdA3N5eJ6lFiyD8ZndL0buVxwmSeMd9sHCcCtRPupe9CXBL/4cEn0jk0TURIlRPAwn6wxQ14rXqCe/MmbnF0NI6e0ZkpcWIXE+JljNnkZNh",
+      "type": "ssh-rsa"
+    }
+  },
+  "sshdsakey": "AAAAB3NzaC1kc3MAAACBAMlNva2+AitS3fWhgAQ7nHta3N5rSphFJyN++bdzF31Z7k+D6H3xqvmqK97Gj6c2hcyB6sEH9v0NgO0xcP/DAcO9C15GbmV6ZmITnTqIKDsFdR8uBwy6BahylymsVXEYuRMDPIyK4PssNR2GFrxhKHegKQ49NKlddRWeVacf6bzXAAAAFQDlyxxBfb2qpoLd5o6KlDxbJ9bH5QAAAIEApJMhMrB+dBMtP/cOYZ+90epzYXtF3lebVdCVopbZJcIwJHhLuKtrCZhOejIXneEMTWj2EnhcawyJgonFQnTv/wqynPAmeTORp/rfkfUkbHf9y/ZQnjbL1faalUZ9Ykq0sen38PcKdW3FQfAYhRwlqJpYJ+hbRELqQN9af8xgUrQAAACAc9lTB/CMxTmQxFp3hLuzS5eciYVFH9cZHhG/eE6fDXJ2rnz9H0Ltts3eufXMY/bQXWtu0z4SR+ISQbyY9lw+WRB8bwFOLI9yvFU9/WZxefadayo5JeBd1AlE/CYjK+iF6dwbNSuOKM0XInzUvyBFk1OKBjbnGfXCb4xp8rUsNfo=",
+  "sshfp_dsa": "SSHFP 2 1 672cd5d5f684b1aa7f2eb9cbf1499a74f9160893\nSSHFP 2 2 0943fb7f09e258ee372f0427be6f983810e87360de71c2784f32aa6b73575c00",
+  "sshfp_rsa": "SSHFP 1 1 27357c8daaab49b818dcdc74cc57b1633c187f87\nSSHFP 1 2 6445652854135c05e407153fac7d24448f9b2bb1564ca1ecc3f170c19662ef47",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQCyB4qnArG2r5i2nIwFeFXrz9nl9D01qsL+uHdpr8XtgGckZ5mPHlfDmc9l5CYdbwFzCW4fp5r7a003mMFFYf8FYSZ7fpF30I3I84D2YKMdPj3uBJpAPhyaDOh7fzZHCbKcoFFROADwFSGoWuTzOuS4Nf2KpHD0UDQRreN2OSR9040OT7wntPWnXpBS8ImAZdTcsJK0gjaq4EUTqvH3El8tdR+xiUiOHzMgrTVS4zPf5TdA3N5eJ6lFiyD8ZndL0buVxwmSeMd9sHCcCtRPupe9CXBL/4cEn0jk0TURIlRPAwn6wxQ14rXqCe/MmbnF0NI6e0ZkpcWIXE+JljNnkZNh",
+  "staging_http_get": "curl",
+  "swapfree": "4.00 GiB",
+  "swapfree_mb": 4095.99609375,
+  "swapsize": "4.00 GiB",
+  "swapsize_mb": 4095.99609375,
+  "system_uptime": {
+    "days": 292,
+    "hours": 7027,
+    "seconds": 25299495,
+    "uptime": "292 days"
+  },
+  "timezone": "EDT",
+  "uptime": "292 days",
+  "uptime_days": 292,
+  "uptime_hours": 7027,
+  "uptime_seconds": 25299495,
+  "uuid": "4213b6ea-e10f-6933-02a3-ac3390f73de7",
+  "vcsrepo_svn_ver": "",
+  "virtual": "vmware",
+  "vmware_tools": {
+    "version": "10.0.9.55972",
+    "build": "3917699"
+  },
+  "zfs_featurenumbers": "1,2,3,4,5",
+  "zfs_version": "5",
+  "zone_global_brand": "native",
+  "zone_global_id": "0",
+  "zone_global_iptype": "shared",
+  "zone_global_name": "global",
+  "zone_global_path": "/",
+  "zone_global_status": "running",
+  "zonename": "global",
+  "zones": 1,
+  "zpool_featurenumbers": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32",
+  "zpool_version": "32",
+  "clientcert": "myhostname.example.com",
+  "clientversion": "5.5.14",
+  "clientnoop": false
+}
diff --git a/facts/3.9/solaris-10-i386.facts b/facts/3.9/solaris-10-i86pc.facts
similarity index 99%
rename from facts/3.9/solaris-10-i386.facts
rename to facts/3.9/solaris-10-i86pc.facts
index 5d886f40..ced23ad5 100644
--- a/facts/3.9/solaris-10-i386.facts
+++ b/facts/3.9/solaris-10-i86pc.facts
@@ -490,7 +490,6 @@
   "operatingsystem": "Solaris",
   "operatingsystemmajrelease": "10",
   "operatingsystemrelease": "10_u8",
-  "opt_mqm_dir": false,
   "os": {
       "architecture": "i86pc",
       "family": "Solaris",
@@ -596,7 +595,6 @@
   "puppet_stringify_facts": false,
   "puppet_vardir": "/opt/puppetlabs/puppet/cache",
   "puppetversion": "5.3.5",
-  "pxe_server": "10.8.34.6",
   "root_home": "/root",
   "ruby": {
       "platform": "i386-solaris2.10",
@@ -655,17 +653,14 @@
       "uptime": "635 days"
   },
   "timezone": "EDT",
-  "tkservice": true,
   "uptime": "635 days",
   "uptime_days": 635,
   "uptime_hours": 15258,
   "uptime_seconds": 54931920,
   "uuid": "34383333-3834-3553-4530-33333e335432",
   "virtual": "physical",
-  "xppxe_server": "10.8.34.9",
   "zfs_featurenumbers": "1,2,3,4,5",
   "zfs_version": "5",
-  "zfscachesize": "1FFCAAAAA",
   "zone_global_brand": "native",
   "zone_global_id": "0",
   "zone_global_iptype": "shared",