Update template loader to make load templates immediately by default