Add Attachment:DRY-36: Signatures: Use source types instead of 3rd type variant