Adding options for handling tags