Further improvements to types