Improved persisting tags