Add support for signatures