Re: Major type-class overhaul