I'll have to look at it again, but this particular form may be dictated by the feature renaming and descriptors stuff