Add tag class and methods