Added service layer