VET-43 : improving the language handling