Improved type handling
No change