Updated templates and project module