Fix service mapping