Bunch of improvements, including tag dictionary and model-specific rules