After a lot of refactoring, signatures bug has been fixed