Add ArgumentMarshaler and Refactor Boolean and String Part