Add Tag and Category support completely