[MC] Refactor
[MC] add valueType attribute in xml file