Added support for Waila.