Started integrating data handling