This thesis addresses a critical challenge in the field of renewable energy, focusing on the efficient utilization of Photovoltaic-thermal (PVT) systems. Despite their promising role in sustainable energy production, PVT systems often grapple with excess heat generation, impacting their efficiency and longevity. The primary objective of this research is to explore the synergy between PVT modules and heat storage systems. It aims to develop and implement solutions for effectively storing this surplus heat. This work involves the formulation of new models for heat storage solutions and their assimilation into the PVMD Toolbox, housed within the Photovoltaic Materials and Devices research group at TU Delft. By enhancing the capability of PVT systems to manage excess heat, this thesis contributes to optimizing these systems for broader applications in sustainable energy generation.