Improved signiture generation, works for calls too. Tested