Reworked signatures processing