Coronal Mass Ejections (CMEs) are the main drivers of interplanetary shocks and space weather disturbances. Their impact on our magnetosphere can cause severe geomagnetic storms and thus their socio-economic impact is substantial. Extreme events could potentially cause a catastrophe. A key parameter determining the geo-effectiveness of a CME is the its internal magnetic configuration upon arrival at Earth. In order to model this properly, advanced flux-rope CME models have been integrated in the heliospheric wind and CME evolution model EUHFORIA (Pomoell & Poedts, 2018). We will discuss the validation of these models and their capabilities to model the CME geo-effectiveness.