More work on signature generation