Add control_class option