Add tag traversal and buffer/tag offsets