Added TYPENAME2 functionality