Add optional classes and carrier reset syntax