Adding changes for PCI