Added WAILA support