Added onTagAdded and onTagRemoved callbacks