Added <plug>, <sid>, etc