Improved JSON & Template system