Updated Data Structure