Feature/refactor initial data fetching #178

Closed othman98shawgan closed 1 year ago