Another mass conversion to shared instances for controllers