Replace Component with NumVariables and edit codes following this replacement