Updated templating dependency and changed internal request handling