LH :: Refactored the templates