Added templates and a manager