Added support for VIAs