Added service + location