#96 - Added table index