added manualy set signatures and corrected some functionality to work with it