Updated service and controller