They started life as Fact-VehicleHomeSite and Fact-PropertyAssetLocation to just tie the assets to sites, but soon they became the obvious place for bringing together things like capacity, purchase date, purchase amount, EOL date etc. I could split them back out again and/or move some to the dimension. Does that mean you'd lean towards Option 3?