Decoupling features and descriptors in progress...