added Solenoid support