Add signature delegation as suggested by @rizar