Added stuff for NumAn and ContMod