Added tag and category entities