Worked on tag integration