Added feature vector generation