added numeric values and multilanguage support