Migration client from 1.x to 2.x
Fixing code style: headers added