Added the service layer