Improved the types classes