add more tables, refactor table lookup