Reorganisation of templates methods