Imporved Vitera and Nexj config