Move fetching to store