Added table handler