Improved types.