Convert types to use middleclass