Rearrange dispatcher.
Add psaux hander.