Refactored descriptor structure, decomposing the signature and variable
features.