Arrows refactorization
Merge branch 'png' of https://github.com/PP-TSD/sdgen into png