Change the way we are working with serialized arguments