Data structure modification
Merge branch 'master' of https://github.com/groud/esbtestmaster