Added improvement with auto-fetch size.