The IRMIS relational database toolkit provides a global view of the facility's installed control software. A non-invasive crawler detects IOC reboots, parses the IOC start up command file and populates the IRMIS database. Additional crawlers capture and store each process variable's Channel Access clients. A separate IRMIS sub-domain captures the facility hardware. Emphasis is placed on documenting the relationships between the components making up the plant ' how they are installed, how they are controlled and the power source for each component. The model has been extended to capture the cabling between the facility infrastructure elements. This paper addresses the elusive goal of merging these disjoint hardware and software domains. The component-type definition has been extended to include the 'channels' exported by each component type. This provides the basis for mapping hardware channels to EPICS process variables. To support this mapping, process variable introspection has been added to the schema. This paper discusses procedures put in place to support data validation and consistency.