message handler refactoring
vhsm refactoring