Added Data Structures Efficiency