Added class(es) to switch based on a type as well as an integer constant.