Adding VITEC address support, successfully tested