A partial implementation of major changes to use a Guava Table as underlying data structure.