More addition to stl code