Second attempt at generic Waila support