Refactoring, fixes to descriptors and signatures