Improved some types