Added control for matrix switches