Semantic enrichment of building models adds meaningful domain-specific or application-specific information to a digital building model. It is applicable to solving interoperability problems and to compilation of models from point cloud data. The SeeBIM (Semantic Enrichment Engine for BIM) prototype software encapsulates domain expert knowledge in computer readable rules for inference of object types, identity and aggregation of systems. However, it is limited to axis-aligned bounding box geometry and the adequacy of its rule-sets cannot be guaranteed. This paper solves these drawbacks by (1) devising a new procedure for compiling inference rule sets that are known a priori to be adequate for complete and thorough classification of model objects, and (2) enhancing the operators to compute complex geometry and enable precise topological rule processing. The procedure for compiling adequate rule sets is illustrated using a synthetic concrete highway bridge model. A real-world highway bridge model, with 333 components of 13 different types and compiled from a laser scanned point cloud, is used to validate the approach and test the enhanced SeeBIM system. All of the elements are classified correctly, demonstrating the efficacy of the approach to semantic enrichment.