update to use feature_class_Set mixin