Moved DataService initialisation to Factory