Add preliminary fingerprinting support, 0.9.11