Improvements to type