Updated signature generation