Updated to include algorithms/data structures