* Further developments on migration tools
* Template improvements