Preliminary add for data-q- attribute collection