Improved type info