Added class for tag handling