Updated WUE and TAE to work with 2D tables