Added taxonomy_manager and token_tweaks