Change from 2D to 1D to reduce number of tables. Change-Id: I6569a757afae5a748e4d84df687468fe460eaa5a