Changes needed while updating the WAI ecosystem