Use more STL stuff