Add more tables
Time decoding was wonky