fixup! Refactor Signature creation from configuration