Added service and controller