Add pm support
解决冲突
Update for connect