Fix to retrieve data via service