Add a few things, remove <modifier> tag