Upgrade UNL_Templates package for speed