Finally fix the bug of losing message, operation & relateds.
Fix code style problem for parameters.