Refactor fetch into realtime collection