Updated each class to use the stl list