Refactored List/Set
Consolidated Fingerprint