Update how values are returned from signature component