Use data structure concept instead of several independent vectors
p4#: 21614