Simplified PFabric Changes