Added prepare-tags