Reorganized ThmSet as HashMap