Added templates to initial load