Allow adding key/value pairs as annotation and signature data

Edited by Bekerle, Patrizio