Added fingerprinting