We've changed order of arguments and it break Boost serialization logic as XML format relies on sequence of arguments to be in same order.

We need to move away from such error prone logic