Improved type support