Add Switcher; add final to all util classes.