Added smarty speed-up stuff