Added support for WAC on old base