#406 Improve templates