Add THA Hooks
Merge THA support