added tagging system in endpoints