Overhaul base classes to match DSU data points.