Add Command Handler
Modify Messager functions to static.