+ Added service layer
+ Changed code to call to service