Add data handling skeleton