Better extensions + descriptor
Rearranged signature