Added a service layer to load the data