A heat exchanger unit (154) and a system (100) comprising a thermal battery (150) for storing thermal energy comprising the heat exchanger unit (154). The thermal battery (150) comprises an insulated tank (152) adapted to hold a Heat Transfer Fluid (HTF), the heat exchanger unit (154) immersed in the HTF, and a heat...