Updated Data Structures and Algorithm