Contact Eco Switch Improvements