Added some optimizations to Table