Update signature handling code