Updates on the documentation and templates [2]