Add psq tables as well
Make sure all eval params are static