Add SignatureCalculator support. Resolves #1773