Fixed snippets for work with pdoTools 1.8.0
Improved builder