Add [before/after]ServerMessage (2)