Added table manager