Added templates and sources