Refactored update fetch to be non-blocking