Adjusted for updated vector and strutil library