Adding Table and TableEntry handling