Ensure backward compatibility in generator