Added some signature oriented stuff.