Improved Data Structure