Update TypeDef and Constants
Update TypeDef and constants