Data Structure Fixes