Type support improved