Add default data to manifest. Improve templates