Added table setup