Updated service mapping