Updated Waila integration