Modify getFeatureSet to instantiate upon first call