Deprecate old generator functions