Minimal changes for data stucture sceleton