Add logic to signature fields