Patch CS
Add tag API