Changed data structures to generic feature vector