Refactor post-SMU3.1
Refactor post-SMU3.1