Update PredictEntry to return features_map