Plugin-tag: code changes