Include return statement in feature extractor