Add class names better