Better handle switching structures