Enhance Smarty

Enhance Smarty