Performace of getFeature improved.