HashSet and DB Fix