No longer hard code class names