Add tagging system and index