Moved feature descriptors to separate plug-ins