Abstract McCad is a geometry conversion tool developed at the Karlsruhe Institute of Technology (KIT) for the automatic conversion of CAD models into the semi-algebraic geometry representations which can then be used in Monte Carlo (MC) particle transport simulations applied in design analyses of fusion and fission reactors. New algorithms for the decomposition of complex geometry models have been designed and implemented in the McCad code. With these improvements, a weakness of the original McCad was mitigated which is due to the instability of the applied graphic kernel and the original decomposition algorithm. The improvements have been verified with some representative test models and a generic model of a DEMO fusion power reactor. The results show that the advanced McCad version with the new decomposition algorithms is more robust and provides more accurate and less complex conversion results. The decomposition process is efficient and produces correct results which are consistent with the original model.