Added spans and offsets